bitkeeper revision 1.1236.1.142 (4244ed8dWNEDW6TXrxQ4FpnJIB61eQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 26 Mar 2005 01:26:49 +0000 (01:26 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 26 Mar 2005 01:26:49 +0000 (01:26 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-clean
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean


Trivial merge